bitkeeper revision 1.1620 (429cd85fOKc8jD7MTDCcMvlczZhiDg)

x86_capability[] array is 32-bit ints, not longs.
Signed-off-by: Scott Parish <srparish@us.ibm.com>

diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index 8b319f1a1ba1ef25086c9fc529cea85abb2522ce..06a814232282d32950a8743a39a52d0a7a67330f 100644 (file)
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -331,7 +331,7 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
 #ifdef NOISY_CAPS
        printk(KERN_DEBUG "CPU: After generic identify, caps:");
        for (i = 0; i < NCAPINTS; i++)
-               printk(" %08lx", c->x86_capability[i]);
+               printk(" %08x", c->x86_capability[i]);
        printk("\n");
 #endif
 
@@ -340,7 +340,7 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
 #ifdef NOISY_CAPS
                printk(KERN_DEBUG "CPU: After vendor identify, caps:");
                for (i = 0; i < NCAPINTS; i++)
-                       printk(" %08lx", c->x86_capability[i]);
+                       printk(" %08x", c->x86_capability[i]);
                printk("\n");
 #endif
        }
@@ -395,7 +395,7 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
 #ifdef NOISY_CAPS
        printk(KERN_DEBUG "CPU: After all inits, caps:");
        for (i = 0; i < NCAPINTS; i++)
-               printk(" %08lx", c->x86_capability[i]);
+               printk(" %08x", c->x86_capability[i]);
        printk("\n");
 #endif
        /*

diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h
index 3df0ee6a5d8b3a71dac2729166e6f4b6f72f7cd5..5e53d48860352e508792a4250be0d1be69fe4cc5 100644 (file)
--- a/xen/include/asm-x86/processor.h
+++ b/xen/include/asm-x86/processor.h
@@ -146,24 +146,23 @@ struct exec_domain;
 #endif
 
 struct cpuinfo_x86 {
-       __u8    x86;            /* CPU family */
-       __u8    x86_vendor;     /* CPU vendor */
-       __u8    x86_model;
-       __u8    x86_mask;
-       char    wp_works_ok;    /* It doesn't on 386's */
-       char    hlt_works_ok;   /* Problems on some 486Dx4's and old 386's */
-       char    hard_math;
-       char    rfu;
-               int     cpuid_level;    /* Maximum supported CPUID level, -1=no CPUID */
-       unsigned long   x86_capability[NCAPINTS];
-       char    x86_vendor_id[16];
-       char    x86_model_id[64];
-       int     x86_cache_size;  /* in KB - valid for CPUS which support this
-                                   call  */
-       int     x86_cache_alignment;    /* In bytes */
-       int     fdiv_bug;
-       int     f00f_bug;
-       int     coma_bug;
+       __u8 x86;               /* CPU family */
+       __u8 x86_vendor;        /* CPU vendor */
+       __u8 x86_model;
+       __u8 x86_mask;
+       char wp_works_ok;       /* It doesn't on 386's */
+       char hlt_works_ok;      /* Problems on some 486Dx4's and old 386's */
+       char hard_math;
+       char rfu;
+    int  cpuid_level;  /* Maximum supported CPUID level, -1=no CPUID */
+       unsigned int x86_capability[NCAPINTS];
+       char x86_vendor_id[16];
+       char x86_model_id[64];
+       int  x86_cache_size;  /* in KB - valid for CPUS which support this call  */
+       int  x86_cache_alignment;       /* In bytes */
+       int      fdiv_bug;
+       int      f00f_bug;
+       int      coma_bug;
        unsigned char x86_num_cores;
 } __cacheline_aligned;